Merge git://git.denx.de/u-boot-fdt
authorTom Rini <[email protected]>
Sat, 14 Jan 2017 17:16:43 +0000 (12:16 -0500)
committerTom Rini <[email protected]>
Sat, 14 Jan 2017 17:16:43 +0000 (12:16 -0500)

Trivial merge